From 510554f6799c6978e857c8aa3ef99a95c520cedd Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Fri, 25 Aug 2017 16:44:38 +0200 Subject: [PATCH] colorplane: Update to using GdkEvent API --- gtk/gtkcolorplane.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/gtk/gtkcolorplane.c b/gtk/gtkcolorplane.c index 10c2ede40d..898760de5a 100644 --- a/gtk/gtkcolorplane.c +++ b/gtk/gtkcolorplane.c @@ -333,23 +333,28 @@ plane_key_press (GtkWidget *widget, { GtkColorPlane *plane = GTK_COLOR_PLANE (widget); gdouble step; + guint keyval, state; - if ((event->state & GDK_MOD1_MASK) != 0) + if (!gdk_event_get_keyval ((GdkEvent *) event, &keyval) || + !gdk_event_get_state ((GdkEvent *) event, &state)) + return GDK_EVENT_PROPAGATE; + + if ((state & GDK_MOD1_MASK) != 0) step = 0.1; else step = 0.01; - if (event->keyval == GDK_KEY_Up || - event->keyval == GDK_KEY_KP_Up) + if (keyval == GDK_KEY_Up || + keyval == GDK_KEY_KP_Up) sv_move (plane, step, 0); - else if (event->keyval == GDK_KEY_Down || - event->keyval == GDK_KEY_KP_Down) + else if (keyval == GDK_KEY_Down || + keyval == GDK_KEY_KP_Down) sv_move (plane, -step, 0); - else if (event->keyval == GDK_KEY_Left || - event->keyval == GDK_KEY_KP_Left) + else if (keyval == GDK_KEY_Left || + keyval == GDK_KEY_KP_Left) sv_move (plane, 0, -step); - else if (event->keyval == GDK_KEY_Right || - event->keyval == GDK_KEY_KP_Right) + else if (keyval == GDK_KEY_Right || + keyval == GDK_KEY_KP_Right) sv_move (plane, 0, step); else return GTK_WIDGET_CLASS (gtk_color_plane_parent_class)->key_press_event (widget, event); -- 2.30.2